Revert "Generate a versioned dependency for the GLib 2.86 transition"

This reverts commit 816fa364ba112b48f62f03ffa054cafd9bd14b76.

diff --git a/debian/clean b/debian/clean
index 1789feeee985c94ce3fb24ab2b13732e263c9f5b..3d6866b9167a653e15e32d533050087515e54cda 100644 (file)
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1 @@
-debian/local.substvars
 debian/home/

diff --git a/debian/control b/debian/control
index a24dee6c89a448d2def100854272948d98490960..675e5b65f01f4d81904414dd1072c156c66c149d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -111,7 +111,6 @@ Depends: gir1.2-accountsservice-1.0,
          python3,
          tecla,
          ${gir:Depends},
-         ${local:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: bolt,

diff --git a/debian/extra-substvars.sh b/debian/extra-substvars.sh
deleted file mode 100755 (executable)
index 959c28f..0000000
--- a/debian/extra-substvars.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright 2025 Simon McVittie
-# SPDX-License-Identifier: MIT
-
-glib_version=$(dpkg-query -W -f '${Version}' "libglib2.0-dev:$DEB_HOST_ARCH")
-
-if dpkg --compare-versions "$glib_version" ge 2.86; then
-    echo "local:Depends=gir1.2-glib-2.0 (>= 2.86.0)"
-else
-    echo "local:Depends=gir1.2-glib-2.0 (<< 2.86.0)"
-fi

diff --git a/debian/rules b/debian/rules
index 3b9df99cd265dbb8489aade541ca2eb55c20a09f..2d609f48825d4ea6f03bc4bfdf7b43c156c11bbc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,9 +69,3 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 endif
 
 override_dh_gnome_clean:
-
-debian/local.substvars:
-       dpkg-architecture -c debian/extra-substvars.sh > $@
-
-override_dh_gencontrol: debian/local.substvars
-       dh_gencontrol -- -Tdebian/local.substvars